Skip to content

Feat/RC to RS conversion remove custom map freetext#428

Merged
EliNoden merged 3 commits into
mainfrom
feat/rc-eda-to-rs-eda-remove-custom-map-freetext
Jul 1, 2026
Merged

Feat/RC to RS conversion remove custom map freetext#428
EliNoden merged 3 commits into
mainfrom
feat/rc-eda-to-rs-eda-remove-custom-map-freetext

Conversation

@EliNoden

@EliNoden EliNoden commented Jul 1, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

🔎 Détails

Le champ "freetext" du customMap introduit dans #427 ne sera pas utilisé par les éditeurs ; étant optionnel, on préfère le retirer. Plusieurs changements :

  • ajout de
[tool.mypy]
plugins = [
    "pydantic.mypy"
]

Dans le converter/pyproject.toml.

Pourquoi

sinon lefthook ne considère pas le champ freetext du CustomMap comme optionnel, et faire :

initialalert_calltaker = CustomMap(
                    key="initialalert.calltaker.organization",
                    label="Identifiant SDIS",
                    value=calltaker_org,
                   # sans le champ 'freetext'
                )

Levait l'erreur lefthook :

converter/cisu/create_case/create_case_cisu_converter.py:174: error: Missing named argument "freetext" for "CustomMap"  [call-arg]
converter/cisu/create_case/create_case_cisu_converter.py:192: error: Missing named argument "freetext" for "CustomMap"  [call-arg]

Alors que dans la définition de la classe, on a bien (et c'est du valid pydantic) :

class CustomMap(BaseModel):
    key: str = Field(..., description="A valoriser avec le nom de la balise")
    value: str = Field(...,description="A valoriser avec la valeur associée à la clé")
    label: Optional[str] = Field(None, description="A valoriser avec le libellé correspondant")
    freetext: Optional[str] = Field(None,description="Informations complémentaires sur le contexte / utilisation de cette correspondance additionnelle")

J'ai également ajouté le param exclude_none=True au custom_map_entry.model_dump de pydantic, car sinon le freetext était inclus avec sa valeur par défaut :

avant

{
      "freetext": null,
      "key": "qualification.victims.count",
      "label": "Nombre de patients-victimes",
      "value": "NON DEFINI"
}

après

# plus de freetext
{
      "key": "qualification.victims.count",
      "label": "Nombre de patients-victimes",
      "value": "NON DEFINI"
}

🔗 Ticket associé

Asana

@github-actions

github-actions Bot commented Jul 1, 2026 •
edited
Loading

Copy link
Copy Markdown

Coverage

Converter - python code coverage
FileStmtsMissBranchBrPartCoverMissing
constants.py4000100% 
conversion_mixin.py2912196%26
converter.py6846194%25–26, 94–95
database.py32224431%12, 16, 18–21, 23, 25, 27, 29–38, 40–41, 49
logging_config.py3528294%29, 36
utils.py168374698%63, 114, 126
cisu
   base_cisu_converter.py3330090%7, 25, 31
   constants.py4000100% 
   identical_cisu_converter.py9000100% 
   utils.py15060100% 
cisu/create_case
   create_case_cisu_constants.py36000100% 
   create_case_cisu_converter.py192244298%134, 250
cisu/reference
   reference_converter.py920077%9, 13
cisu/resources_info
   resources_info_cisu_constants.py12000100% 
   resources_info_cisu_converter.py171332398%175, 201, 389
   resources_info_cisu_helper.py49318293%58, 63, 66
cisu/resources_status
   resources_status_constants.py4000100% 
   resources_status_converter.py4114097%33
conversion_strategy
   cisu_conversion_strategy.py49222295%68, 93
   conversion_strategy.py7020100% 
   health_conversion_strategy.py460240100% 
models
   persisted_message.py13000100% 
repositories
   message_repository.py701212282%90–91, 98, 118–120, 122–123, 125, 171–173
versions
   base_message_converter.py831214285%13, 72–74, 86, 98, 102, 106, 110, 114, 118, 124
   error_converter.py510080%7
   identical_message_converter.py15000100% 
   utils.py26512280%34–37, 43
versions/create_case_health
   constants.py4000100% 
   create_case_health_converter.py1780800100% 
   create_case_health_update_converter.py5000100% 
versions/create_case_health/v1_v2
   constants.py17000100% 
   utils.py460222100% 
versions/create_case_health/v2_v3
   constants.py29000100% 
versions/geo_positions_update
   geo_positions_update_constants.py4000100% 
   geo_positions_update_converter.py49312493%31, 42, 79
versions/geo_resources_details
   geo_resources_details_constants.py4000100% 
   geo_resources_details_converter.py27040100% 
versions/reference
   reference_constants.py2000100% 
   reference_converter.py13000100% 
versions/resources_engagement
   resources_engagement_constants.py3000100% 
   resources_engagement_converter.py22021100% 
versions/resources_info
   resources_info_constants.py20000100% 
   resources_info_converter.py870363100% 
versions/resources_request
   resources_request_constants.py2000100% 
   resources_request_converter.py21000100% 
versions/resources_response
   resources_response_constants.py4000100% 
   resources_response_converter.py16020100% 
versions/resources_status
   resources_status_constants.py10000100% 
   resources_status_converter.py39000100% 
TOTAL1827814423995% 

@github-actions

github-actions Bot commented Jul 1, 2026

Copy link
Copy Markdown

There is no coverage information present for the Files changed

Total Project Coverage 52.48% 🍏

@EliNoden EliNoden force-pushed the feat/rc-eda-to-rs-eda-remove-custom-map-freetext branch from 068276d to 72959cb Compare July 1, 2026 08:25
@github-actions

github-actions Bot commented Jul 1, 2026

Copy link
Copy Markdown

There is no coverage information present for the Files changed

Total Project Coverage 52.48% 🍏

@EliNoden EliNoden force-pushed the feat/rc-eda-to-rs-eda-remove-custom-map-freetext branch from 72959cb to 3ee1797 Compare July 1, 2026 08:34
@EliNoden EliNoden force-pushed the feat/rc-eda-to-rs-eda-remove-custom-map-freetext branch from 3ee1797 to d5582f9 Compare July 1, 2026 08:35
@github-actions

github-actions Bot commented Jul 1, 2026

Copy link
Copy Markdown

There is no coverage information present for the Files changed

Total Project Coverage 52.48% 🍏

1 similar comment
@github-actions

github-actions Bot commented Jul 1, 2026

Copy link
Copy Markdown

There is no coverage information present for the Files changed

Total Project Coverage 52.48% 🍏

@EliNoden EliNoden merged commit 0d4be30 into main Jul 1, 2026
2 checks passed
@EliNoden EliNoden deleted the feat/rc-eda-to-rs-eda-remove-custom-map-freetext branch July 1, 2026 09:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Clemsazert Clemsazert Clemsazert approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@EliNoden @Clemsazert